csab choice locking changed